Skip to content

[PM-39708] fix: Show correct UI for unpaid subscription status#2862

Open
KatherineInCode wants to merge 14 commits into
mainfrom
pm-39708/unpaid-status-details
Open

[PM-39708] fix: Show correct UI for unpaid subscription status#2862
KatherineInCode wants to merge 14 commits into
mainfrom
pm-39708/unpaid-status-details

Conversation

@KatherineInCode

@KatherineInCode KatherineInCode commented Jul 7, 2026 •
edited by atlassian Bot
Loading

Copy link
Copy Markdown
Contributor

🎟️ Tracking

PM-39708

📔 Objective

SubscriptionStatus.unpaid is the state Stripe assigns after ~8 failed payment attempts, at which point the server sets premium = FALSE. The app was aliasing it to updatePayment (a dunning state where premium is still active), causing two bugs:

  • The vault list showed the generic "Upgrade to Premium" action card instead of "Subscription needs attention"
  • Settings → Plan showed "Update payment" description and copy, instead of unpaid-specific copy directing the user to reinstate via the web vault

Changes:

  • PremiumPlanStatus: Added .unpaid as a first-class case (danger badge, isTroubleState = true); added isPaymentProblemState property (true for pastDue/unpaid/updatePayment) to drive the attention card
  • BillingService.refreshSubscriptionAttentionCard: Removed doesActiveAccountHavePremiumPersonally() guard so lapsed users are surfaced on every sync regardless of premium flag; free users hit a silent 404 (GetSubscriptionRequestError). Matches Android's explicit design decision in PremiumStateManagerImpl
  • VaultListProcessor: Extracted refreshPremiumActionCards() — attention card and upgrade card are now mutually exclusive; attention card takes priority
  • Plan screen: unpaid-specific description ("Your subscription was suspended on [date]. To reactivate, please resolve your past due invoices."), danger badge labeled "Unpaid", cancel button hidden

📸 Screenshots

@KatherineInCode
[PM-39708] fix: Show correct UI for unpaid subscription status
d0a6865 
Unpaid is a lapsed state (premium = FALSE after repeated payment
failures) that was being aliased to updatePayment, causing the vault
list to show the generic "Upgrade to Premium" card and the Plan screen
to show "Update payment" details instead of unpaid-specific copy.

- Add PremiumPlanStatus.unpaid as a first-class case (danger badge,
  isTroubleState = true)
- Add isPaymentProblemState to PremiumPlanStatus covering pastDue,
  unpaid, and updatePayment — drives the attention card
- Show "subscription needs attention" card for unpaid; suppress the
  upgrade card when attention card is visible (extracted to
  refreshPremiumActionCards())
- Remove doesActiveAccountHavePremiumPersonally() guard from
  refreshSubscriptionAttentionCard so lapsed users are surfaced on
  every sync regardless of premium flag (matches Android behavior)
- Plan screen: unpaid description, hidden cancel button, danger badge
@github-actions github-actions Bot added app:password-manager Bitwarden Password Manager app context app:authenticator Bitwarden Authenticator app context t:bug Change Type - Bug labels Jul 7, 2026
@codecov

codecov Bot commented Jul 7, 2026 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 40.60%. Comparing base (438d632) to head (9df760f).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files 
@@             Coverage Diff             @@
##             main    #2862       +/-   ##
===========================================
- Coverage   81.27%   40.60%   -40.68%     
===========================================
  Files        1028      357      -671     
  Lines       66164    16657    -49507     
===========================================
- Hits        53773     6763    -47010     
+ Misses      12391     9894     -2497

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@KatherineInCode KatherineInCode marked this pull request as ready for review July 9, 2026 15:11
@KatherineInCode KatherineInCode requested review from a team and matt-livefront as code owners July 9, 2026 15:11
@KatherineInCode KatherineInCode added the ai-review Request a Claude code review label Jul 9, 2026
@github-actions

github-actions Bot commented Jul 9, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🤖 Bitwarden Claude Code Review

Overall Assessment: APPROVE

Reviewed the fix that promotes SubscriptionStatus.unpaid to a first-class PremiumPlanStatus case instead of aliasing it to .updatePayment. Verified the new isPaymentProblemState property, the removal of the doesActiveAccountHavePremiumPersonally() guard in refreshSubscriptionAttentionCard, the extracted refreshPremiumActionCards() mutual-exclusivity logic, and the unpaid-specific Plan screen copy. Confirmed the catch is GetSubscriptionRequestError free-user path matches the existing SettingsProcessor convention and that all PremiumPlanStatus switches remain exhaustive.

Code Review Details

No blocking findings.

The broadened refreshSubscriptionAttentionCard behavior — free users now make a getSubscription() call returning a silent 404 on every sync — is an intentional, documented design decision (noted in both the PR description and the code comment, matching Android's PremiumStateManagerImpl), so it is not flagged.

Test coverage is comprehensive: parameterized action-card matrix, new isPaymentProblemState cases, and unpaid description/badge/label assertions. The two prior review threads (private-property assignment and the refreshPremiumActionCards() placement) are resolved by later commits.

claude[bot]
claude Bot reviewed Jul 9, 2026
View reviewed changes
Comment thread BitwardenShared/UI/Billing/PremiumPlan/PremiumPlanStateTests.swift Outdated
matt-livefront
matt-livefront reviewed Jul 10, 2026
View reviewed changes
Comment thread BitwardenShared/UI/Vault/Vault/VaultList/VaultListProcessor.swift Outdated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@matt-livefront matt-livefront matt-livefront left review comments
@claude claude[bot] claude[bot] left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

ai-review Request a Claude code review app:authenticator Bitwarden Authenticator app context app:password-manager Bitwarden Password Manager app context t:bug Change Type - Bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@KatherineInCode @matt-livefront